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