Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:48:28 +0000 (20:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 18:48:28 +0000 (20:48 +0200)

Trivial merge