Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)

Trivial merge