Fast-forward upstream
Bump version