Merge branch 'MDL-67969-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Wed, 4 Mar 2020 11:58:04 +0000 (12:58 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 4 Mar 2020 11:58:04 +0000 (12:58 +0100)

Trivial merge