Merge branch 'MDL-65519-master' of https://github.com/ryanwyllie/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 9 May 2019 01:31:47 +0000 (09:31 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 9 May 2019 01:31:47 +0000 (09:31 +0800)

Trivial merge