Git merges in Moodle 3.11.x by AMOS bot

commit 59208e5f3fdb3d2c7b1a9fd3828593ce8dd812be
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 12 Dec 2020 08:07:31 +0800
Tag:    v3.11.0-beta

Merge branch 'MOODLE_311_STABLE' into install_311_STABLE

commit cba8e995c35f8bbb41830ab4e8b122bdeb90f84d
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 28 Nov 2020 08:07:28 +0800
Tag:    v3.11.0-beta

Merge branch 'MOODLE_311_STABLE' into install_311_STABLE