This is the commit from cygwin