Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 22:36:07 +0000 (00:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 22:36:07 +0000 (00:36 +0200)

Trivial merge