Merge branch 'wip-MDL-46682-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 11:50:12 +0000 (13:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 11:50:12 +0000 (13:50 +0200)

Trivial merge