Merge branch 'MDL-70316-311' of git://github.com/mihailges/moodle into MOODLE_311_STABLE