Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 07:24:24 +0000 (09:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 07:24:24 +0000 (09:24 +0200)

Trivial merge