е -> ё
Merge branch 'master' into android-1.5
--no-edit merge option
Merge branch 'master' into android-1.5