Merge branch 'MDL-76652-311' of https://github.com/lameze/moodle into MOODLE_311_STABLE