Merge branch 'MDL-55465-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 04:31:46 +0000 (12:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 04:31:46 +0000 (12:31 +0800)

Trivial merge