Merge branch 'MDL-65794_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jul 2019 06:26:55 +0000 (14:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jul 2019 06:26:55 +0000 (14:26 +0800)

Trivial merge