Debian merge with master & changelog, dep update