Upstream version 20061031