Merge branch 'MDL-70114-master' of git://github.com/bmbrands/moodle
authorSara Arjona <sara@moodle.com>
Wed, 4 Nov 2020 19:14:50 +0000 (20:14 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 4 Nov 2020 19:14:50 +0000 (20:14 +0100)

Trivial merge