Merge branch 'ad/cygwin-wants-rename' into maint