Merge branch 'MDL-61166-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:38 +0000 (10:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:38 +0000 (10:57 +0100)

Trivial merge