Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maint