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