Merge branch 'MDL-66247-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 31 Oct 2019 06:34:52 +0000 (14:34 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 31 Oct 2019 06:34:52 +0000 (14:34 +0800)

Trivial merge