Backport changes from loop-server repo
Merge pull request #2 from mozilla-services/backport-changes

Backport changes from loop-server repo