[AC21.4] Cygwin Patches, Round 2