Merge branch 'MDL-65976-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Tue, 29 Sep 2020 12:09:26 +0000 (14:09 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 29 Sep 2020 12:09:26 +0000 (14:09 +0200)

Trivial merge