Merge branch 'wip-MDL-62147-master-4' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 May 2018 06:27:19 +0000 (14:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 May 2018 06:27:19 +0000 (14:27 +0800)

Trivial merge