Merge branch 'MDL-45515-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 23 Oct 2015 02:59:34 +0000 (10:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 23 Oct 2015 02:59:34 +0000 (10:59 +0800)

Trivial merge