VIVO-504
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
Merge branch 'maint-rel-1.6' into develop