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

commit 595b858da03cc450de92650e8d3c509e3064c87b
Author: Víctor Déniz <victor@moodle.com>
Date:   Tue, 11 May 2021 06:42:52 +0800
Tag:    v3.10.5

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