Bumped version to 2.8.1
reverted #1405 because it spawned 1451
Merge branch 'hotfix/2.8.1'