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