Merge branch 'MDL-52673-master' of https://github.com/pauln/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 02:23:53 +0000 (10:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 02:23:53 +0000 (10:23 +0800)

Trivial merge