Development: merge upstream on debian