Imported Upstream version 2014.12.01