Merge branch 'wip-MDL-60591-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:35:58 +0000 (22:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:35:58 +0000 (22:35 +0100)

Trivial merge