Update changelog
Sync with upstream
Next release will be 2.0
Bump to 2.0 snapshot