merge 0.8.2 into master