Sync with upstream
Bump version