Imported Upstream version 1.6.2
Imported Upstream version 1.7.0