Git merges in Moodle 3.11.1 by Ilya Tregubov

commit 0d13cd3f29fce9a8c0c4e5e666ac13ab8996dbeb
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Mon, 05 Jul 2021 18:35:35 +0800
Tag:    v3.11.1

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