Merge branch 'master' into rf-a

Change-Id: I8ab44033c6950dfeb25aeaa60a6f8defa38f5a1c
Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>