Merge branch 'MDL-62325-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Jun 2018 00:05:50 +0000 (02:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Jun 2018 00:05:50 +0000 (02:05 +0200)

Trivial merge