Merge branch 'jrmwng-feature/upgrade-to-vs2017/jrmwng'