Merge branch 'rj/no-xopen-source-for-cygwin' into maint