Merge branch 'ml/cygwin-mingw-headers'