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