Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle