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