Merge branch 'MDL-52012-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:49:01 +0000 (13:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:49:01 +0000 (13:49 +0800)

Trivial merge