Git merges in Moodle 3.10.7 by abgreeve

commit b597ecfbcd572a8af252aa0b189f02d5e5fdea8c
Author: abgreeve <adrian@moodle.com>
Date:   Wed, 04 Aug 2021 15:51:28 +0800
Tag:    v3.10.7

Merge branch 'MDL-71050-310' of https://github.com/paulholden/moodle into MOODLE_310_STABLE


commit 811e47e0b41987db181a80ecc4ed1e738d4553da
Author: abgreeve <adrian@moodle.com>
Date:   Tue, 03 Aug 2021 10:24:39 +0800
Tag:    v3.10.7

Merge branch 'MDL-67833-310' of https://github.com/paulholden/moodle into MOODLE_310_STABLE