Merge branch 'MDL-42638-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2019 21:32:56 +0000 (22:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2019 21:32:56 +0000 (22:32 +0100)

Trivial merge