Merge branch 'MDL-66548-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 23:00:59 +0000 (01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 23:00:59 +0000 (01:00 +0200)

Trivial merge