Fix for cygwin environment
Merge branch 'cygwin' into develop