Imported Upstream version 2.5.0