Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 00:59:47 +0000 (08:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 00:59:47 +0000 (08:59 +0800)

Trivial merge