Imported Upstream version 20130510