Merge branch 'MDL-65492' of https://github.com/timhunt/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 13 Jun 2019 01:17:06 +0000 (09:17 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Jun 2019 16:04:53 +0000 (18:04 +0200)

Trivial merge