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