Merge branch 'MDL-60814_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 00:24:46 +0000 (01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 00:24:46 +0000 (01:24 +0100)

Trivial merge