merge with current debian apt/sid