Sync master branch with rel-0.6-maint for 0.6.3 Release and 1.10.0 VIVO/Vitro release
Created by: roflinn
Sync master branch with rel-0.6-maint for 0.6.3 Release and 1.10.0 VIVO/Vitro release
Created by: roflinn
Sync master branch with rel-0.6-maint for 0.6.3 Release and 1.10.0 VIVO/Vitro release