Imported Upstream version 2014.02.17