Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:44:07 +0000 (19:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:44:07 +0000 (19:44 +0200)

Trivial merge