Imported Upstream version 0.6.6
Imported Upstream version 0.8.0