Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)

Trivial merge