Git merges in Moodle 3.10.3 by Víctor Déniz

commit 5f7136f17c055dceed5161d97658ef997e3fbf83
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 24 Mar 2021 07:01:31 +0800
Tag:    v3.10.3

Merge branch 'MDL-71022-310' of git://github.com/paulholden/moodle into MOODLE_310_STABLE


commit 3278f5ca505256f89d9f52e056f561c3fa7e8da7
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 24 Mar 2021 02:24:19 +0800
Tag:    v3.10.3

Merge branch 'MDL-70727-310' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_310_STABLE