Merge branch 'MDL-68112-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Fri, 10 Apr 2020 10:11:29 +0000 (12:11 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 10 Apr 2020 10:11:29 +0000 (12:11 +0200)

Trivial merge