Upstream version 4.0-20100604