Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jun 2016 00:02:32 +0000 (08:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jun 2016 00:02:32 +0000 (08:02 +0800)

Trivial merge