tree 3c8b34e5ac06efcbd7bf207bd99bd62614b690aa
parent 90226be77957608b89f409ad851c4e79c46849a1
parent 69944b1e67d63e2c5da0b214a82b04f382995552
author Jaeden Amero <jaeden.amero@arm.com> 1522317222 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1522317222 +0100

Merge remote-tracking branch 'upstream-public/pr/1134' into development-proposed

Fixes #504 and fixes #1057