Imported Upstream version 2.9+ds