Merge branch 'MDL-68971' of https://github.com/timhunt/moodle