Merge from cygw32 branch