Merge branch 'MDL-66405-master-fix' of https://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Nov 2019 11:11:41 +0000 (12:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Nov 2019 11:11:41 +0000 (12:11 +0100)

Trivial merge