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