Merge pull request #1709 from CircleCI-Public/fix-org-list