Merge branch 'MDL-65388-master' of https://github.com/ryanwyllie/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 1 May 2019 08:06:24 +0000 (16:06 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 1 May 2019 08:06:24 +0000 (16:06 +0800)

Trivial merge