Merge branch 'MDL-60959-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 00:14:39 +0000 (01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 00:14:39 +0000 (01:14 +0100)

Trivial merge