Imported Upstream version 2.10~beta3+ds