Move to a single optional repo
Merge pull request #1854 from pculture/merge-optional-repos

Move to a single optional repo