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