Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:03:06 +0000 (01:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:03:06 +0000 (01:03 +0200)

Trivial merge