Imported Upstream version 2013.07.02