respond to new rubocop
Merge branch 'master' into features/clean_up_en_locales