Merge branch 'MDL-52996-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 04:44:06 +0000 (12:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 04:44:06 +0000 (12:44 +0800)

Trivial merge