Merge branch 'MDL-60181-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 11:30:44 +0000 (12:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 11:30:44 +0000 (12:30 +0100)

Trivial merge