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

Trivial merge