Merge branch 'js/windows-dotgit' into maint