Merge pull request #6358 from RosettaCommons/guangfeng/galiganddock_vsx_update Guangfeng/galiganddock vsx update