Merge branch 'MDL-70287-master-3' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Wed, 10 Mar 2021 19:48:44 +0000 (20:48 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 10 Mar 2021 19:48:44 +0000 (20:48 +0100)

Trivial merge