Fix strip endline when file is encoded as dos.
Merge branch 'master' into 7_00