Merge branch 'MDL-66106-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2019 22:54:36 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2019 22:54:36 +0000 (00:54 +0200)

Trivial merge