Merge branch 'MDL-61204-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:16:40 +0000 (02:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:16:40 +0000 (02:16 +0100)

Trivial merge