Merge branch 'MDL-46931' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 Mar 2019 00:26:39 +0000 (01:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 Mar 2019 00:26:39 +0000 (01:26 +0100)

Trivial merge