Merge branch 'MDL-71517' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 5 May 2021 10:17:31 +0000 (12:17 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 5 May 2021 10:17:31 +0000 (12:17 +0200)

Trivial merge