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