Imported Upstream version 3.7~beta1