Merge branch 'MDL-40669' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 11:13:15 +0000 (13:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 11:13:15 +0000 (13:13 +0200)

Trivial merge