Merge branch 'MDL-64640-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Feb 2019 09:26:01 +0000 (10:26 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Feb 2019 09:26:01 +0000 (10:26 +0100)

Trivial merge