Merge branch 'MDL-68688-master' of git://github.com/aanabit/moodle into master
authorSara Arjona <sara@moodle.com>
Wed, 16 Sep 2020 15:03:16 +0000 (17:03 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 06:43:51 +0000 (08:43 +0200)

Trivial merge