Upstream version 20080603