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