Merge branch 'MDL-61312-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:47:44 +0000 (00:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:47:44 +0000 (00:47 +0100)

Trivial merge