merge from the lp:~mvo/apt/mvo branch