Imported Upstream version 2013.08.29