Merge branch 'MDL-68344-master' of https://github.com/JBThong/moodle into master
authorSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 06:44:46 +0000 (08:44 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 06:44:46 +0000 (08:44 +0200)

Trivial merge