Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 22:10:45 +0000 (00:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 22:10:45 +0000 (00:10 +0200)

Trivial merge