Merge branch 'MDL-65774-master2' of git://github.com/peterRd/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 08:48:12 +0000 (10:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 08:48:12 +0000 (10:48 +0200)

Trivial merge