Merge branch 'MDL-61995-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:15:38 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 00:15:38 +0000 (08:15 +0800)

Trivial merge