Merge branch 'MDL-56769-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 05:38:00 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 05:38:00 +0000 (13:38 +0800)

Trivial merge