Merge branch 'MDL-66091_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 14:46:51 +0000 (16:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 14:46:51 +0000 (16:46 +0200)

Trivial merge