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