Merge branch 'MDL-52570-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:49:22 +0000 (09:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:49:22 +0000 (09:49 +0800)

Trivial merge