[PATCH] Merging the Cygwin changes