Git merges in Moodle 3.9.11 by Shamim Rezaie

commit e6079323bfb0c23460ed26ceb3683b2fb91df607
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 29 Oct 2021 00:37:15 +0800
Tag:    v3.9.11

Merge branch 'MDL-72874-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE


commit fea492ca6db480893051155aeb170c8e315f6dc3
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 15 Oct 2021 21:29:28 +0800
Tag:    v3.9.11

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