Merge branch 'MDL-66132-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2019 18:56:29 +0000 (20:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2019 18:56:29 +0000 (20:56 +0200)

Trivial merge