Update to new upstream release (v0.9.6)