Merge in Cygwin-related changes from main trunk.