Merge branch 'MDL-70112_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorVíctor Déniz <victor@moodle.com>
Wed, 4 Nov 2020 19:17:34 +0000 (19:17 +0000)
committerVíctor Déniz <victor@moodle.com>
Wed, 4 Nov 2020 19:17:34 +0000 (19:17 +0000)

Trivial merge