Upstream version 0.99.10