also merge hotfixes into master when they're finished
Bumping version to 0.8.11.
Adding line to CHANGELOG: * hotfixes should merge into the development branch as well as the source branch
Merge branch 'feature/merge-hotfixes-and-releases-into-master-and-production'