Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 09:15:11 +0000 (11:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 09:15:11 +0000 (11:15 +0200)

Trivial merge