Imported Upstream version 2014.1.a35.g5aaf7c5