dos2unix
Merged upstream