merge from -debian branch