Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190813' into staging