Merge branch 'MDL-69418-master' of https://github.com/dmitriim/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:56:56 +0000 (10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 02:56:56 +0000 (10:56 +0800)

Trivial merge