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