Merge branch 'MDL-65130-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 3 Apr 2019 05:39:28 +0000 (13:39 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 3 Apr 2019 05:39:28 +0000 (13:39 +0800)

Trivial merge