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