Merge branch 'MDL-60943-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:17 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:17 +0000 (00:52 +0100)

Trivial merge