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