Merge branch 'MDL-71397-311' of git://github.com/marinaglancy/moodle into MOODLE_311_...