Upstream version 20110619