Merge remote-tracking branch 'joncham/sgen-msvc2'