Merge branch 'MDL-69759-m310' of https://github.com/sammarshallou/moodle into MOODLE_...
authorVíctor Déniz <victor@moodle.com>
Wed, 7 Oct 2020 21:24:58 +0000 (22:24 +0100)
committerVíctor Déniz <victor@moodle.com>
Wed, 7 Oct 2020 21:24:58 +0000 (22:24 +0100)

Trivial merge