Merge branch 'MDL-23887-master-2' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:41 +0000 (00:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:41 +0000 (00:24 +0100)

Trivial merge