Imported Upstream version 2014.01.17.2