Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.5-20151204' into staging