Merge branch 'MDL-69897' of https://github.com/paulholden/moodle into master
authorSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 16:14:45 +0000 (18:14 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 16:14:45 +0000 (18:14 +0200)

Trivial merge