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