Merge branch 'sp/cygwin-build-fixes'