merge conflict
Search
* gene - hst-3.2
* fix #839
merge
merge
Merge branch 'master' into production
update external links - fix #727