Merge branch 'MDL-61568-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 06:24:28 +0000 (14:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 06:24:28 +0000 (14:24 +0800)

Trivial merge