Upstream version 20110214