Merge branch 'ml/cygwin-filemode'