Merge branch 'master_MDL-61050' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 19:38:29 +0000 (20:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 19:38:29 +0000 (20:38 +0100)

Trivial merge