Merge branch 'release/0.9.6'
Typo fix
Merge branch 'master' into develop