upgrade to 3.8.2
Merge branch 'develop'