Imported Upstream version 1.26