Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)

Trivial merge