Merge branch 'MDL-64392-master' of git://github.com/bmbrands/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Dec 2018 11:02:43 +0000 (12:02 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Dec 2018 11:02:43 +0000 (12:02 +0100)

Trivial merge