Merge branch 'MDL-70141-master' of https://github.com/sammarshallou/moodle
authorSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 07:39:14 +0000 (08:39 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 07:39:14 +0000 (08:39 +0100)

Trivial merge