Merge branch 'MDL-72377-311' of https://github.com/paulholden/moodle into MOODLE_311_...