Merge branch 'wip-MDL-55333-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 02:01:05 +0000 (10:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 02:01:05 +0000 (10:01 +0800)

Trivial merge