Merging fix for MH-8791 (and MH-9398) into 1.3.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.3.x@13796 e6edf6fb-f266-4316-afb4-e53d95876a76