Merge branch 'j6t/mingw'