Merge branch '2918_cygwin_test_build'