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