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