tree 33d1bfc0569428589d2984286bc2ce252e88466a
parent 8645e908255694e8d3c3f1c04b439cc66cdd35a3
parent f69ad5a898fae494992d974f4f3a245ea3e30afd
author Jaeden Amero <jaeden.amero@arm.com> 1522237828 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1522237828 +0100

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

Fixes #1299, fixes #1475