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