Merge branch 'MDL-63794-master-2' of git://github.com/mihailges/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 18 Dec 2018 11:13:35 +0000 (12:13 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 18 Dec 2018 11:13:35 +0000 (12:13 +0100)

Trivial merge