Merge branch 'MDL-69736-master' of git://github.com/ferranrecio/moodle into master
authorSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 07:03:42 +0000 (09:03 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 07:03:42 +0000 (09:03 +0200)

Trivial merge