Merge back Debian changes.
14 files changed