Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)

Trivial merge