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