Merge branch 'wip-MDL-62391-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jun 2018 00:33:32 +0000 (08:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jun 2018 00:33:32 +0000 (08:33 +0800)

Trivial merge