Bumping version numbers
Merge branch 'hotfix/0.8.7'