Imported Upstream version 1.6.0.6