Imported Upstream version 20130922+ds1