Issue #154
Merge pull request #184 from mozilla-services/issue_154

Issue #154
Merge branch 'dev' into features/plugin-restarting