Merge branch 'MDL-65731' of https://github.com/timhunt/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 5 Jun 2019 02:39:29 +0000 (10:39 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 5 Jun 2019 02:39:29 +0000 (10:39 +0800)

Trivial merge