Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:18:22 +0000 (12:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:18:22 +0000 (12:18 +0800)

Trivial merge