Fix for cygwin environment
Merge branch 'cygwin' into develop
Minor fix
Merge branch 'develop'