Merge branch 'master' into next-minor

config/locales/devise/devise.de_formal.yml

config/locales/devise/devise.hu.yml

config/locales/devise/devise.sk.yml

config/locales/diaspora/ar.yml

config/locales/diaspora/cs.yml

config/locales/diaspora/da.yml

config/locales/diaspora/de-CH.yml

config/locales/diaspora/de.yml

config/locales/diaspora/de_formal.yml

config/locales/diaspora/en_valspeak.yml

config/locales/diaspora/es-AR.yml

config/locales/diaspora/es.yml

config/locales/diaspora/fi.yml

config/locales/diaspora/fr.yml

config/locales/diaspora/he.yml

config/locales/diaspora/hu.yml

config/locales/diaspora/hy.yml

config/locales/diaspora/ia.yml

config/locales/diaspora/it.yml

config/locales/diaspora/ja-KS.yml