Merge branch 'MDL-69863_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE