Merge branch 'MDL-66818-39' of git://github.com/lameze/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:17:01 +0000 (08:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:17:01 +0000 (08:17 +0800)

Trivial merge