Merge branch 'MDL-68277' of https://github.com/timhunt/moodle
authorSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 07:14:36 +0000 (09:14 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 07:14:36 +0000 (09:14 +0200)

Trivial merge