Merge branch 'MDL-66705-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2019 22:52:52 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2019 22:52:52 +0000 (00:52 +0200)

Trivial merge