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

Trivial merge