Merge branch 'rj/maint-simplify-cygwin-makefile' into maint