Merge branch 'wip-MDL-60337-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 07:40:44 +0000 (15:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 07:40:44 +0000 (15:40 +0800)

Trivial merge