Merge tag 'upstream/0.6.8' into pkg-ubuntu

Upstream version 0.6.8
Imported Upstream version 0.6.8
Packaging upstream release version 0.6.8.
Imported Upstream version 0.6.9
Merge tag 'upstream/0.6.9' into pkg-ubuntu

Upstream version 0.6.9
Packaging upstream release version 0.6.9.
Preparing for a release.