Merge branch 'wip-MDL-60241-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 17:28:40 +0000 (18:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 17:28:40 +0000 (18:28 +0100)

Trivial merge