Merge branch 'release/0.84.9' into develop
Fix a nasty crash.
version bump for 0.84.10.
Merge branch 'release/0.84.10'