Merge branch 'MDL-52383' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:16:19 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:16:19 +0000 (10:16 +0800)

Trivial merge