Merge branch 'MDL-70066-310' of git://github.com/lameze/moodle into MOODLE_310_STABLE