cygwin to 5.18
Merge branch 'dev' into ms