am ef6f60fe: Merge commit \'e9d96b1a\' into nov15-conflicts

* commit 'ef6f60fe9b8a1f3426835b35f579ce5980d4ca33':
  Import revised translations. DO NOT MERGE