Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging