Git merges in Moodle 3.9.8 by Andrew Nicols

commit 94b897a1766afdbbe83658e04e78a2412c2850cd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 16 Jun 2021 13:14:34 +0800
Tag:    v3.9.8

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


commit b8122e1de3f535c98303099d3826a99f09d8ccc8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 15 Jun 2021 11:28:45 +0800
Tag:    v3.9.8

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