Merge branch 'MDL-57814-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 17:00:48 +0000 (18:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 17:00:48 +0000 (18:00 +0100)

Trivial merge