Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint