Merge branch 'MDL-66174-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 29 Jul 2019 06:38:35 +0000 (14:38 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 29 Jul 2019 06:38:35 +0000 (14:38 +0800)

Trivial merge