Imported Upstream version 2.11~beta2+ds