Imported Upstream version 1.5.8