am 8b4a58e1: am b720c8d6: am b0206765: Merge "Make sure that names of all entries have the same encoding."

* commit '8b4a58e1dfd8a1f59a7c436954028449a86a0d4e':
  Make sure that names of all entries have the same encoding.