Merge branch 'MDL-28501-310' of https://github.com/mackensen/moodle into MOODLE_310_S...
authorSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 11:28:51 +0000 (13:28 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 11:28:51 +0000 (13:28 +0200)

Trivial merge