Update to new upstream release (v0.3.9)