Merge "Allow make 3.82 to be used under Cygwin 1.7"