Merge branch 'upstream'
debian/changelog: update to 0.2-1