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