Merge branch 'MDL-46881-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2019 10:12:21 +0000 (11:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Jan 2019 10:12:21 +0000 (11:12 +0100)

Trivial merge