Merge branch 'jc/not-mingw-cygwin'