0.8.2
Merge branch 'release/0.8.2' into develop