Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 22:57:27 +0000 (23:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:11:52 +0000 (00:11 +0100)

Trivial merge