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

Trivial merge