version update
Merge branch 'release/0.9.5' into develop