Refs #4798 - Fixing the subscription API
Merge pull request #3875 from daviddavis/temp/20140324094605

Refs #4798 - Fixing the subscription API