Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)

Trivial merge