Actually fix from mail
Merge branch 'master' into production

* master:
  Actually fix from mail