Update History from merge commits
Bump version and prepare for release