Merge branch 'MDL-43130' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2019 23:17:27 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2019 23:17:27 +0000 (00:17 +0100)

Trivial merge