Do not include locales which are not present in I18n.available_locales. This is important when using gems that include translations for locales you don't want.
Merge remote-tracking branch 'remotes/shields/avail-locales'
Merge remote-tracking branch 'remotes/shields/no-conflict'
Merge remote-tracking branch 'remotes/shields/master' into no-conflict