Upstream version 0.5.2