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