Merge branch 'js/mingw-rename-fix' into maint