This is part of the fix for CVE-2012-3544 Resolve a FIXME and expand unit tests to cover CRLF vs LF checking.