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