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

commit 0cc154a14caddf0b9ae77b5f10e5e25648bc9514
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 23 Jun 2021 01:38:19 +0800
Tag:    v3.11.1

Merge branch 'MDL-71634-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE