Update to new upstream release (v2.2.0)