Merge branch 'MDL-66982_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Oct 2019 19:12:20 +0000 (20:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Oct 2019 19:12:20 +0000 (20:12 +0100)

Trivial merge