Merge branch 'MDL-69553' of https://github.com/NeillM/moodle
authorSara Arjona <sara@moodle.com>
Thu, 22 Oct 2020 06:55:55 +0000 (08:55 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 22 Oct 2020 06:55:55 +0000 (08:55 +0200)

Trivial merge