Merge 0.8.1 release back into dev