Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging