Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171122' into staging