Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle