Merge branch 'MDL-65474-master' of https://github.com/ryanwyllie/moodle
authorDavid MonllaĆ³ <davidm@moodle.com>
Mon, 6 May 2019 08:06:41 +0000 (10:06 +0200)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 7 May 2019 08:24:37 +0000 (16:24 +0800)

Trivial merge