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