from entry alerts
Merge branch 'master' into production

* master:
  from entry alerts