Merge branch 'MDL-53500-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Apr 2016 04:22:42 +0000 (12:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Apr 2016 04:22:42 +0000 (12:22 +0800)

Trivial merge