set eol=crlf
Merge remote-tracking branch 'origin/master' into CC49