961293 - Fixing broken response
Merge pull request #2227 from daviddavis/temp_1368099072

961293 - Fixing broken response