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