Merge branch 'MDL-67285-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Nov 2019 02:28:56 +0000 (10:28 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Nov 2019 02:28:56 +0000 (10:28 +0800)

Trivial merge