Merge branch 'MDL-65173_master' of git://github.com/markn86/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 1 Apr 2019 02:21:10 +0000 (10:21 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 1 Apr 2019 02:21:10 +0000 (10:21 +0800)

Trivial merge