tree ece1367a65ef32ac344de43df632cb8e14ed4b36
parent 4380e339db381f703afaa26c6f974f30094e8bc2
parent 5747b49db2a70efae30a4fc9c7629341813363a0
author Paladox <thomasmulhall410@yahoo.com> 1522359995 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1522359995 +0100

Merge branch 'stable-2.15'

* stable-2.15:
  Fix dependency management for tests

Change-Id: Ic357778c1eefc7465b5dbd9fe4de0c8674182b18