Merge branch 'MDL-65102-master' of git://github.com/rezaies/moodle
authorDavid MonllaĆ³ <davidm@moodle.com>
Mon, 22 Apr 2019 11:16:32 +0000 (13:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Apr 2019 11:42:37 +0000 (13:42 +0200)

Trivial merge