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

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