Merge branch 'MDL-51983-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 07:21:37 +0000 (15:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 07:21:37 +0000 (15:21 +0800)

Trivial merge