Fixes #221: wrong return types causing 500 error.
Merge branch 'master' into dev.webcompat.com

* master:
  Fixes #221: wrong return types causing 500 error.