Merge branch 'MDL-60158-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 20:06:00 +0000 (22:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 20:06:00 +0000 (22:06 +0200)

Trivial merge