merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back