Imported Upstream version 2.25