Merge branch 'MDL-51528-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 02:42:15 +0000 (10:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2015 02:42:15 +0000 (10:42 +0800)

Trivial merge