Merge branch 'MDL-65605-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Tue, 21 May 2019 11:47:31 +0000 (13:47 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 21 May 2019 11:47:31 +0000 (13:47 +0200)

Trivial merge