Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 06:05:07 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 06:05:07 +0000 (14:05 +0800)

Trivial merge