Merge pull request #2220 from RosettaCommons/everyday847/hotfix_two our great national nightmare is over