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