Matterhorn trunk from https://opencast.jira.com/svn/MH/trunk/ with Edu changes