Merge branch 'wip-MDL-59800-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 01:08:34 +0000 (09:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 01:08:34 +0000 (09:08 +0800)

Trivial merge