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

Trivial merge