Xinyang Ge - 2020-02-23

Sorry that I accidentally included my local changes to .conf.win32-cygwin in the patch. Please ignore my changes in .conf.win32-cygwin.