Follow-up fix for bug#7337.
Merge branch 'master' of git.otrs.com:otrs/otrs