Merge branch 'rj/sh-setup-mswin-pwd'