Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161205' into staging