Merge branch 'MDL-60918-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 19:17:20 +0000 (20:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 19:17:20 +0000 (20:17 +0100)

Trivial merge