Merge branch 'MDL-48362-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 04:58:54 +0000 (12:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 04:58:54 +0000 (12:58 +0800)

Trivial merge