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