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