Merge branch 'MDL-69638_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 13:01:56 +0000 (15:01 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 13:01:56 +0000 (15:01 +0200)

Trivial merge