Do not ignore secret token on heroku
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable