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

Trivial merge