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