[ issue 1203 ] fixed
Merge branch 'Issue1203'
Line breaks of some .err files
Merge branch 'maint-2.4.0'
Merge remote-tracking branch 'upstream/master'