Merge branch 'MDL-64784' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 22 May 2019 06:48:28 +0000 (14:48 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 22 May 2019 06:48:28 +0000 (14:48 +0800)

Trivial merge