Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20181221' into staging