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

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