Upstream version 0.7.4