Merge branch 'MDL-66436-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 23:21:16 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 23:21:16 +0000 (01:21 +0200)

Trivial merge