Upstream version 0.0940