Merge branch 'MDL-69823-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 06:41:19 +0000 (07:41 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 06:41:19 +0000 (07:41 +0100)

Trivial merge