Merge branch 'MDL-60459_master' of git://github.com/markn86/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 19 Feb 2019 10:48:14 +0000 (11:48 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 19 Feb 2019 10:48:14 +0000 (11:48 +0100)

Trivial merge