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