Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle