Upstream version 0.18