Merge branch 'MDL-52507_master' of https://github.com/jinhofer/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:07:13 +0000 (09:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:07:13 +0000 (09:07 +0800)

Trivial merge