Imported Upstream version 20130301~current