Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20161028' into staging