[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Merge branch 'master' into stable7

* master:
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex