Merge branch 'sk/mingw-uni-fix-more'