Merge branch 'js/mingw-rename-fix'