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

commit cbbdd85bd81c8eff7d220f284b9b40bb75e3c5ca
Author: Víctor Déniz <victor@moodle.com>
Date:   Thu, 30 Sep 2021 23:10:43 +0800
Tag:    v3.9.11

Merge branch 'MDL-72399_39' of https://github.com/stronk7/moodle into MOODLE_39_STABLE