Merge branch 'MDL-66749-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2019 20:03:08 +0000 (22:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2019 20:03:08 +0000 (22:03 +0200)

Trivial merge