Merge branch 'MDL-52189' of https://github.com/jonof/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 21:43:22 +0000 (22:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 21:43:22 +0000 (22:43 +0100)

Trivial merge