Merge branch 'MDL-72096-311' of https://github.com/mickhawkins/moodle into MOODLE_311...