Upstream version 2006ac.2