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