Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:33 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:14:33 +0000 (01:14 +0200)

Trivial merge