7.x

line ending fixes