Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160617' into staging