Merge branch 'MDL-61077' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:26:04 +0000 (02:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:26:04 +0000 (02:26 +0100)

Trivial merge