Merge branch 'MDL-64314_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 18 Feb 2019 13:50:59 +0000 (14:50 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 18 Feb 2019 13:50:59 +0000 (14:50 +0100)

Trivial merge