Merge branch 'MDL-62915' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2019 14:21:41 +0000 (16:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2019 14:21:41 +0000 (16:21 +0200)

Trivial merge