Merge branch 'MDL-51799-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2015 05:16:15 +0000 (13:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 29 Oct 2015 05:16:15 +0000 (13:16 +0800)

Trivial merge