Merge branch 'rj/mingw-cygwin'