Merge branch 'MDL-67721-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Mon, 3 Feb 2020 13:52:16 +0000 (14:52 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 3 Feb 2020 13:52:16 +0000 (14:52 +0100)

Trivial merge