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