Merge branch 'MDL-68688-310' of git://github.com/aanabit/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 16 Sep 2020 15:03:27 +0000 (17:03 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 07:16:52 +0000 (09:16 +0200)

Trivial merge