Merge remote-tracking branch 'pmaydell/tags/pull-arm-devs-20130715' into staging