Git merges in Moodle 3.9.14 by Andrew Nicols

commit c61c66666710785d21a0c4245bf3c2b95027fe37
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 31 Mar 2022 22:34:20 +0800
Tag:    v3.9.14

Merge branch 'MDL-72446_39' of https://github.com/stronk7/moodle into MOODLE_39_STABLE