Upstream version 20060219