Merge branch 'MDL-61568-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 07:00:16 +0000 (15:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 07:00:16 +0000 (15:00 +0800)

Trivial merge