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