Merge branch 'MDL-70422-310' of https://github.com/paulholden/moodle into MOODLE_310_...