Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)

Trivial merge