Merge branch 'MDL-61081-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:27:38 +0000 (00:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:27:38 +0000 (00:27 +0100)

Trivial merge