Merge branch 'MDL-65522' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 14:09:57 +0000 (16:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 14:09:57 +0000 (16:09 +0200)

Trivial merge