Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170403' into staging