Imported Upstream version 2013.12.04