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