Merge branch 'MDL-66011-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 9 Oct 2019 02:40:02 +0000 (10:40 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 9 Oct 2019 02:40:02 +0000 (10:40 +0800)

Trivial merge