Upstream version 0.4.18