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

Trivial merge