Imported Upstream version 0.8.2
Merge branch 'debian-upstream' into upstream