Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle