More work on warehouse catalog.
Merge pull request #748 from rustyswayne/1.3.0

More work on warehouse catalog.