Merge branch 'wip-MDL-51735-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 18:15:13 +0000 (20:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 18:15:13 +0000 (20:15 +0200)

Trivial merge