Merge branch 'MDL-55237_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:54:46 +0000 (12:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:54:46 +0000 (12:54 +0200)

Trivial merge