Bump version for release
Merge branch 'release/0.96a6'
Merge tag '0.96a6' into development

Various bugfixes.