Merge branch 'MDL-62808_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:29:29 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:29:29 +0000 (13:29 +0800)

Trivial merge