Merge branch 'MDL-66970_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:59:18 +0000 (23:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:59:18 +0000 (23:59 +0200)

Trivial merge