Merge branch 'MDL-29895' of https://github.com/enovation/moodle