Git merges in Moodle 3.11.x by Travis CI

commit 5a3e84a5a274a5fc2588ee278124738ed4a7c509
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 13:55:09 +0800
Tag:    v3.11.0-beta

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

commit 474a3cecfe28b36b35c546ef9984d355af9bb89b
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 13:47:02 +0800
Tag:    v3.11.0-beta

Merge branch 'MDL-71104-311-2' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE