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