Merge 0.8 master

A proposed merge of _0.8_ branch into _master_, ready for a _0.9.1_ release.