Merge branch 'MDL-68797-master' of https://github.com/nguyenphuctien/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:27:17 +0000 (12:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:27:17 +0000 (12:27 +0800)

Trivial merge