Merge branch 'rj/cygwin-msvc'