Merge branch 'MDL-67656-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 01:44:17 +0000 (09:44 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 01:44:17 +0000 (09:44 +0800)

Trivial merge