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