Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170823' into staging