Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2019 11:36:09 +0000 (12:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2019 11:36:09 +0000 (12:36 +0100)

Trivial merge