merged -r 1898..1899 from lp:~donkult/apt/sid