Merge pull request #4655 from RosettaCommons/guangfeng/galiganddock_bugfix Guangfeng/galiganddock bugfix