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

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