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