Bump version for release.
Cleanup import.
Merge branch 'release/0.96a7'
Merge tag '0.96a7' into development

Various bugfixes and cleanup.