Merging fix for MH-8854 into trunk.

git-svn-id: http://opencast.jira.com/svn/MH/trunk@13703 e6edf6fb-f266-4316-afb4-e53d95876a76