Merge branch 'wip-MDL-38129-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Jul 2017 07:03:30 +0000 (15:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Jul 2017 07:03:30 +0000 (15:03 +0800)

Trivial merge