Merge branch 'MDL-70525_310' of https://github.com/TomoTsuyuki/moodle into MOODLE_310...