Merge branch 'MDL-64484' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Jun 2019 17:43:52 +0000 (19:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Jun 2019 17:43:52 +0000 (19:43 +0200)

Trivial merge