Merge tag 'upstream/0.1.9998svn2713+dfsg'

Upstream version 0.1.9998svn2713+dfsg
Imported Upstream version 0.1.9998svn2713+dfsg
update changelog
update changelog
Imported Upstream version 0.1.9998svn2695+dfsg
Merge tag 'upstream/0.1.9998svn2695+dfsg'

Upstream version 0.1.9998svn2695+dfsg