Imported Upstream version 0.26