Imported Upstream version 2013.01.09