Don't affect the penny when this is not the case
Merge branch 'master' into deploy

* master:
  Don't affect the penny when this is not the case