Merge branch 'MDL-67902-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Mon, 9 Mar 2020 14:06:35 +0000 (15:06 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 9 Mar 2020 14:06:35 +0000 (15:06 +0100)

Trivial merge