Merge branch 'MDL-65083-master' of git://github.com/bmbrands/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 02:03:25 +0000 (10:03 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 02:03:25 +0000 (10:03 +0800)

Trivial merge