0.8.2

Pulling from 0.82 to master.