Updating to 2.8.2
Merge branch 'develop'