Merge branch 'MDL-60812-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 15:33:07 +0000 (16:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 15:33:07 +0000 (16:33 +0100)

Trivial merge