Merge branch 'MDL-53836-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 May 2016 05:18:55 +0000 (13:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 May 2016 05:18:55 +0000 (13:18 +0800)

Trivial merge