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