Imported Upstream version 0.8.4
Merge branch 'debian'
Update version