Merge branch 'MDL-68084' of https://github.com/paulholden/moodle