Merge branch 'MDL-69645-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:00:49 +0000 (11:00 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 9 Sep 2020 09:00:49 +0000 (11:00 +0200)

Trivial merge