Merge branch 'MDL-65308' of git://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 24 Apr 2019 01:27:07 +0000 (09:27 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 24 Apr 2019 01:27:07 +0000 (09:27 +0800)

Trivial merge