Merge branch 'MDL-66560-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Sep 2019 00:15:15 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Sep 2019 00:15:15 +0000 (02:15 +0200)

Trivial merge