Merge branch 'MDL-66311-master' of git://github.com/vmdef/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 01:47:44 +0000 (09:47 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 01:47:44 +0000 (09:47 +0800)

Trivial merge