Merge branch 'MDL-52586-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:06:03 +0000 (09:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:06:03 +0000 (09:06 +0800)

Trivial merge