Merge branch 'MDL-58286-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:39:21 +0000 (09:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:39:21 +0000 (09:39 +0200)

Trivial merge