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