Merge branch 'MDL-69246_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:40:12 +0000 (10:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:40:12 +0000 (10:40 +0800)

Trivial merge