Merge tag 'md/3.18-fix' of git://neil.brown.name/md