Merge branch 'wip-MDL-46874-m26' of git://github.com/marinaglancy/moodle into MOODLE_...