Merge branch 'MDL-35918-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:42:24 +0000 (13:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:42:24 +0000 (13:42 +0800)

Trivial merge