Imported Upstream version 0.6.8
Imported Upstream version 0.6.9