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