Merge branch 'MDL-69360-39' of git://github.com/NoelDeMartin/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:52:15 +0000 (10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:52:15 +0000 (10:52 +0800)

Trivial merge