Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160418' into staging