Merge branch 'test-cygwin'