Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:37:06 +0000 (13:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:37:06 +0000 (13:37 +0800)

Trivial merge