Prep work to expose multiple catalogs
Merge pull request #730 from rustyswayne/1.3.0

Prep work to expose multiple catalogs