Merge branch 'MDL-38020-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 03:58:24 +0000 (11:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:04 +0000 (09:31 +0000)

Trivial merge