Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:35:23 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:35:23 +0000 (08:35 +0800)

Trivial merge