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