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