merged r1972 from lp:~paolorotolo/apt/fix-for-967393