Merge branch 'MDL-56649-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 17:37:05 +0000 (19:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 17:37:05 +0000 (19:37 +0200)

Trivial merge