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