Merge branch 'MDL-64347-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2019 22:53:59 +0000 (23:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2019 22:53:59 +0000 (23:53 +0100)

Trivial merge