Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 07:08:37 +0000 (15:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 07:08:37 +0000 (15:08 +0800)

Trivial merge