Issue #1193
Merge pull request #1195 from mozilla-services/issue_1193

Issue 1193