Merge branch 'MDL-61234-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:37:44 +0000 (01:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:37:44 +0000 (01:37 +0100)

Trivial merge