Merge branch 'MDL-51709-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 07:04:13 +0000 (09:04 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 07:04:13 +0000 (09:04 +0200)

Trivial merge