[ fix ] Fixed layout of error messages for unquoting.
Merge branch 'maint-2.4.2'