Merge branch 'rth/atomic/ppc'