Merged Cygwin support branch