Merge branch 'wip-MDL-57188-master-2' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Aug 2017 05:13:47 +0000 (13:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Aug 2017 05:13:47 +0000 (13:13 +0800)

Trivial merge