Imported Upstream version 2.11~beta1+ds