VIVO-112: and the slog continues...
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop