Merge branch 'mlx4-fixes'