Imported Upstream version 2014.1.a39.gaf6da95