Allow for non-JSON return to non-callback implementers
Merge pull request #2 from mitchmac/6.x

Allow for non-JSON return to non-callback implementers

Reviewed by Phil S.