Merge branch 'MDL-53669_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)

Trivial merge