Merge branch 'wip-MDL-61759-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 10:31:04 +0000 (18:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 10:31:04 +0000 (18:31 +0800)

Trivial merge