Merge branch 'bw/cp-a-is-gnuism' into maint