Merge remote-tracking branch 'sv/master'
# Conflicts: # cps/translations/sv/LC_MESSAGES/messages.mo # cps/translations/sv/LC_MESSAGES/messages.popull/1264/head
commit
20b07e0752
# Conflicts: # cps/translations/sv/LC_MESSAGES/messages.mo # cps/translations/sv/LC_MESSAGES/messages.popull/1264/head