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