Merge branch 'cygwin-compilation'