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

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