Upstream version 20061229