Merge branch 'm29_MDL-49782' of https://github.com/totara/moodle