е -> ё
Merge branch 'master' into ice-cream-sandwich
--no-edit merge option
Merge branch 'master' into ice-cream-sandwich