Merge branch 'MDL-52625_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 00:05:17 +0000 (08:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 00:05:17 +0000 (08:05 +0800)

Trivial merge