Merge branch 'MDL-62631-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Feb 2019 09:33:57 +0000 (10:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Feb 2019 09:33:57 +0000 (10:33 +0100)

Trivial merge