merge r1966..1967 from lp:~donkult/apt/sid