forgot to remove before_filter
Merge branch 'master' into release