integrate changes from github to avoid merge conflict (all credits to Krassmus), fixes #3337

git-svn-id: svn://develop.studip.de/studip/trunk@26019 c5b85792-5220-0410-ad23-ed5b6b8ad999