Upstream version 3-2012042300