Merge branch 'js/mingw-res-rebuild'