Merge branch 'rj/submodule-mswin-path'