Line breaks of some .err files
Merge branch 'maint-2.4.0'