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