Bump version and update release notes
Merge remote-tracking branch 'origin/master' into develop
Finish up the docs for cutting a release