Merge branch 'js/add-i-mingw' into maint