Upstream version 0.4.26