Merge branch 'MDL-65096-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 22:01:37 +0000 (00:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 22:01:37 +0000 (00:01 +0200)

Trivial merge