Merge branch 'MDL-69005' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2020 15:52:53 +0000 (17:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Jun 2020 15:52:53 +0000 (17:52 +0200)

Trivial merge