Merge branch 'MDL-69466-master' of https://github.com/JBThong/moodle into master
authorSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:39:05 +0000 (11:39 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:39:05 +0000 (11:39 +0200)

Trivial merge