Merge branch 'MDL-66220-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2020 21:33:45 +0000 (22:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2020 21:33:45 +0000 (22:33 +0100)

Trivial merge