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