Merge branch 'MDL-63142-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:18:35 +0000 (00:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 22:18:35 +0000 (00:18 +0200)

Trivial merge