Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)

Trivial merge