Merge branch 'MDL-67544-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2020 15:35:39 +0000 (16:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2020 15:35:39 +0000 (16:35 +0100)

Trivial merge