Code

Merged debian/changelog from 'master' into experimental.