backport d16a1b2a818359e8c3ade85f789e66ed7ca9488c

[Thomas Heil]

Hi,

Its mentioned that commit d16a1b2a818359e8c3ade85f789e66ed7ca9488c
should be backported to 1.4.
The patch applies without problems and as far as I can see it doesnt
create a problem.

regards,
thomas