Merge branch 'wip-MDL-61242-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:06 +0000 (01:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:06 +0000 (01:41 +0100)

Trivial merge