Issue #399
Merge pull request #408 from mozilla-services/issue_399

Issue #399