fix for jira issue vivo-124
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop