Fix rollbar items
Merge branch 'master' into staging