merge from lp:~donkult/apt/sid