Merge branch 'MDL-66954-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:31:37 +0000 (23:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:31:37 +0000 (23:31 +0200)

Trivial merge