release 0.9.5
Merge branch 'release/0.9.5' into develop