Git merges in Moodle 3.10.3 by Jun Pataleta

commit 348d2c66df7056228c3f653ed862dc4bb697ce66
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 18 Mar 2021 12:23:27 +0800
Tag:    v3.10.3

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