Merge changes from topic "am-d51e0fa1e4bd4a48b102884e94bfbcdf"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c7ddaa42 -s ours am: a1baeaa9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba342b2 -s ours am: 50020ac3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 658222b3 -s ours am: 060cfa0e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e8b82f4 -s ours am: a83efd97 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 145410cc -s ours am: 4e71c4f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37ca8571 -s ours am: 9da0feb1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c1b7ad5a -s ours am: 199d67d4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8ba0bf -s ours am: 19de8c7d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5834612d -s ours am: 0b5bb7e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d547b973 -s ours am: 51d0e397 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9111a69a -s ours am: 568064f4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30afdccb -s ours am: 2adc0521 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5677791f -s ours am: f0c04091 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 458f2bd6 -s ours am: f8af1464 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0594fcc1 -s ours am: 71d2257e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e45aa4c6 -s ours am: 5de0a775 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8d6b3bda -s ours am: 188caaa2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51c0c5a1 -s ours am: 58957302 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b9321663 -s ours am: 44bccc8d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0ab21dd -s ours am: 65f2f49e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4c4770b -s ours am: a41a8d9e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 919ff36b -s ours am: aaadf9da -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d6b33d63 -s ours am: a1e3a826 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a06e0099 -s ours am: 0b76cc8e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ac01733e -s ours am: 71ad5843 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e0ba433 -s ours am: 8716e7da -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d36d7d8e -s ours am: 9f0a26fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a8e8ab8d -s ours am: d64dede8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a5dab966 -s ours am: 38731ffc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 843ef2ce -s ours am: fc398903 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3e2ae38e -s ours am: 46bf1b36 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24c3870b -s ours am: b8334dcc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1ce0dd93 -s ours am: d799fc51 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe8025e6 -s ours am: fa5e0a04 -s ours