Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE