Merge remote-tracking branch 'origin/master' into origin/release/1.8.x

Create a merge commit so that the RC1 tag appears correctly in release/1.8.x

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I1a7d6cd9adbc010a866812e0e3871a7032cdc4f5