Merge branch 'cb/maint-orphan-merge-noclobber' into maint