eol style changed to crlf
Backward compatibility
Merge remote-tracking branch 'origin/master' into feat_n1