Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 00:07:56 +0000 (08:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 00:07:56 +0000 (08:07 +0800)

Trivial merge