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