Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 11:35:43 +0000 (12:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 11:35:43 +0000 (12:35 +0100)

Trivial merge