Imported Upstream version 20130111~current