Merge branch 'MDL-69112-39' of git://github.com/merrill-oakland/moodle into MOODLE_39...
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Aug 2020 05:26:05 +0000 (13:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Aug 2020 05:26:05 +0000 (13:26 +0800)

Trivial merge