Merge branch 'MDL-67845-master-3' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 03:22:26 +0000 (11:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 May 2020 03:22:26 +0000 (11:22 +0800)

Trivial merge