Merge branch 'af/tcsh-completion-noclobber' into maint