tree e4725c68570c8c64f1077039b0c0ce2e22f609ff
parent 5747b49db2a70efae30a4fc9c7629341813363a0
parent 12e5099a7e5ba2b0e4e7cbcd7282b592b74c72f3
author Paladox <thomasmulhall410@yahoo.com> 1525803711 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1525803711 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  At least get tests compiling properly

Change-Id: I0cf2d33e47a8511e11edb3b7ed8a844da7afbb23