Merge branch 'MDL-67129-master-2' of git://github.com/bmbrands/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 11 Nov 2019 00:07:03 +0000 (08:07 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 11 Nov 2019 00:07:03 +0000 (08:07 +0800)

Trivial merge