Merge pull request #2944 from pulpe/SWRMediathek