Merge develop -> master for 0.8 release prep

Needs release notes to be updated but then I think we're good to merge.