Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180410' into staging