Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:15 +0000 (20:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:15 +0000 (20:48 +0100)

Trivial merge