Merge branch 'release/0.9.6.1' into develop
Fix search error (refs #32)
release 0.9.6.2
Merge branch 'release/0.9.6.2'