Fixed a bug which prevented windows newlines (CRLF).
Merge branch 'master' into sql