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