Git merges in Moodle 3.10.x by AMOS bot

commit 12b20cbf3be64110fefdffd276a52b061f991643
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 12 Dec 2020 08:07:27 +0800
Tag:    v3.10.1

Merge branch 'MOODLE_310_STABLE' into install_310_STABLE