fix email address
Merge branch 'experimental-debian' into debian