0.8.2

Merging in master's changes to 0.8.2 prior to publishing.