Merge branch 'MDL-68909-master' of git://github.com/sarjona/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2020 21:58:01 +0000 (23:58 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 06:43:51 +0000 (08:43 +0200)

Trivial merge