Merge branch 'MDL-63818-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 4 Nov 2018 23:02:56 +0000 (00:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 4 Nov 2018 23:02:56 +0000 (00:02 +0100)

Trivial merge