Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.1-20181108' into staging