Merge branch 'macclane-pcru' into spartan