Merge branch 'rj/config-cygwin'