Merge branch 'master' into macclane-pcru