Merge branch 'MDL-62169-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 09:24:26 +0000 (17:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 09:24:26 +0000 (17:24 +0800)

Trivial merge