Imported Upstream version 2014.10.30