Imported Upstream version 20130922