Merge branch 'master' into next-minor

config/locales/devise/devise.de_formal.yml

config/locales/devise/devise.fr.yml

config/locales/devise/devise.pl.yml

config/locales/devise/devise.pt-BR.yml

config/locales/diaspora/da.yml

config/locales/diaspora/de.yml

config/locales/diaspora/de_formal.yml

config/locales/diaspora/es-CL.yml

config/locales/diaspora/es.yml

config/locales/diaspora/fr.yml

config/locales/diaspora/hy.yml

config/locales/diaspora/io.yml

config/locales/diaspora/is.yml

config/locales/diaspora/it.yml

config/locales/diaspora/nb.yml

config/locales/diaspora/nl.yml

config/locales/diaspora/oc.yml

config/locales/diaspora/pl.yml

config/locales/diaspora/pt-BR.yml

config/locales/diaspora/ro.yml