Bump version
Merge upstream changes