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