Imported Upstream version 2.0~beta1