More EOL conversions
Merge branch 'master' into MessageCounts