Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)

Trivial merge