Update from upstream
Bump version