Git merges in Moodle 3.11.2 by Sara Arjona

commit 7487cbd04345e823235d3e26e1b5c19d5e264092
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 13 Jul 2021 22:44:40 +0800
Tag:    v3.11.2

Merge branch 'MDL-71782_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE