Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180622' into staging