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