Merge branch 'MDL-67117-master-2' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Nov 2019 00:03:58 +0000 (01:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Nov 2019 00:03:58 +0000 (01:03 +0100)

Trivial merge