Imported Upstream version 0.6.10
Merge tag 'upstream/0.6.10' into pkg-ubuntu

Upstream version 0.6.10
Preparing for a release.