Merge branch 'wip-MDL-64404-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:28:54 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:28:54 +0000 (01:28 +0100)

Trivial merge