Updated to new upstream release (v0.8.7)