Merge branch 'MDL-61063-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:02:08 +0000 (22:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:02:08 +0000 (22:02 +0100)

Trivial merge