Imported Upstream version 2014.11.23