Merge branch 'MDL-75771-master' of https://github.com/PhMemmel/moodle