Merge branch 'MDL-64629-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 18:00:31 +0000 (19:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 18:00:31 +0000 (19:00 +0100)

Trivial merge