Git merges in Moodle 3.11.7 by Shamim Rezaie

commit 8d2f2e7d375398a4ef518d42e4e79db87c3402c4
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 08 Apr 2022 10:39:13 +0800
Tag:    v3.11.7

Merge branch 'MDL-73874-311' of https://github.com/BruceGoodGuy/moodle into MOODLE_311_STABLE