Merge branch 'wip-MDL-56635-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 03:27:11 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 03:27:11 +0000 (11:27 +0800)

Trivial merge