Merge branch 'MDL-66542_master' of https://github.com/t-schroeder/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 13:56:08 +0000 (15:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 13:56:08 +0000 (15:56 +0200)

Trivial merge