merge 0.8.2 release into master