Imported Upstream version 2014.1.a40.g019d753