Merge branch 'MDL-70373_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE