Merge branch 'MDL-60682' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:37:59 +0000 (20:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:37:59 +0000 (20:37 +0100)

Trivial merge