Merge branch 'MDL-63614_M37v1' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:19:01 +0000 (13:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:19:01 +0000 (13:19 +0100)

Trivial merge