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