merge 1695..1701 from the lp:~mvo/apt/mvo branch