Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:38:18 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:38:18 +0000 (20:38 +0200)

Trivial merge