Update maintainer's email address.
Update debian/changelog.
Merge branch 'master' into wheezy-backports
Update debian/changelog.