Merge branch 'mdl-59562' of https://github.com/Peterburnett/moodle