Merge branch 'MDL-66428_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2019 22:28:30 +0000 (00:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2019 22:28:30 +0000 (00:28 +0200)

Trivial merge