Imported Upstream version 2013.10.23