Merge branch 'MDL-58410_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Jan 2018 00:15:39 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Jan 2018 00:15:39 +0000 (08:15 +0800)

Trivial merge