Merge branch 'MDL-67472-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 21:56:37 +0000 (22:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 21:56:37 +0000 (22:56 +0100)

Trivial merge