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

Trivial merge