Git merges in Moodle 3.11.2 by abgreeve

commit fdaeb5c7c34e60c85f87ef9146bd396ec2df0b69
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 16 Jul 2021 10:16:37 +0800
Tag:    v3.11.2

Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE