Merge branch 'MDL-61584' of git://github.com/jrchamp/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 23:46:09 +0000 (00:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 23:46:09 +0000 (00:46 +0100)

Trivial merge