Merge branch 'MDL-68784' of https://github.com/Peterburnett/moodle