Backward compatible changes to support instant gratification
Merge pull request #208 from adamarla/master

Backward compatible changes to support instant gratification