MDL-43348
Merge branch 'master' into MOODLE_26_BC