Merge branch 'MDL-67449-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2020 22:43:43 +0000 (23:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2020 22:43:43 +0000 (23:43 +0100)

Trivial merge